Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 14 Mar 2010 00:17:00 +0000 (00:17 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 14 Mar 2010 00:17:00 +0000 (00:17 +0000)

Trivial merge